This repository was archived by the owner on Oct 16, 2020. It is now read-only.
Snippet support for autocompletion #323
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
felixfbecker
suggested changes
Aug 1, 2017
src/typescript-service.ts
Outdated
| @@ -173,6 +174,8 @@ export class TypeScriptService { | |||
| } | |||
| }; | |||
|
|
|||
| private completionWithSnippets: boolean = false; | |||
There was a problem hiding this comment.
The name is a bit vague. Please add a supports prefix or something like that
src/typescript-service.ts
Outdated
| @@ -200,6 +203,10 @@ export class TypeScriptService { | |||
| if (params.rootUri || params.rootPath) { | |||
| this.root = params.rootPath || uri2path(params.rootUri!); | |||
| this.rootUri = params.rootUri || path2uri(params.rootPath!); | |||
|
|
|||
| if (params.capabilities.textDocument && params.capabilities.textDocument.completion && params.capabilities.textDocument.completion.completionItem) { | |||
There was a problem hiding this comment.
no need for the if, just set the flag to the result of the boolean expression
src/typescript-service.ts
Outdated
| @@ -998,10 +1005,19 @@ export class TypeScriptService { | |||
| if (completions == null) { | |||
| return []; | |||
| } | |||
| function createSnippet(entry: ts.CompletionEntryDetails): string { | |||
There was a problem hiding this comment.
this is only used in one place, so no benefit to put in an inline function, but makes the code not chronological. Better to do it inline and document
| @@ -31,7 +36,7 @@ export interface TestContext { | |||
| * @param createService A factory that creates the TypeScript service. Allows to test subclasses of TypeScriptService | |||
| * @param files A Map from URI to file content of files that should be available in the workspace | |||
| */ | |||
| export const initializeTypeScriptService = (createService: TypeScriptServiceFactory, rootUri: string, files: Map<string, string>) => async function (this: TestContext & IBeforeAndAfterContext): Promise<void> { | |||
| export const initializeTypeScriptService = (createService: TypeScriptServiceFactory, rootUri: string, files: Map<string, string>, clientCapabilities?: ClientCapabilities) => async function (this: TestContext & IBeforeAndAfterContext): Promise<void> { | |||
There was a problem hiding this comment.
Put the default value into the parameter
| @@ -16,6 +16,11 @@ import { IBeforeAndAfterContext, ISuiteCallbackContext, ITestCallbackContext } f | |||
| chai.use(chaiAsPromised); | |||
| const assert = chai.assert; | |||
|
|
|||
| const defaultCapabilities: ClientCapabilities = { | |||
felixfbecker
reviewed
Aug 3, 2017
src/typescript-service.ts
Outdated
| const parameters = entry.displayParts | ||
| .filter(p => p.kind === 'parameterName') | ||
| .map(p => { | ||
| index++; |
There was a problem hiding this comment.
map passes the index as a second parameter
Codecov Report
@@ Coverage Diff @@
## master #323 +/- ##
==========================================
+ Coverage 59.64% 59.88% +0.24%
==========================================
Files 14 14
Lines 2126 2139 +13
Branches 347 350 +3
==========================================
+ Hits 1268 1281 +13
Misses 708 708
Partials 150 150
Continue to review full report at Codecov.
|
Rename to supportsCompletionWithSnippets + doctype Fix up assignment Pull createSnippet into function Use index param from map
rename constant, use as default value
felixfbecker
approved these changes
Aug 3, 2017
|
Great, thanks for the reviews! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If the client sends
snippetSupport: truein the textDocument/completion/completionItem capability, this PR adds support for responding with these fields set in CompletionItem:Both VS Code and Sublime Text support these snippets.
For clients not supporting snippets, CompletionItem will now contain